From: Glenn Morris <rgm@gnu.org>
Date: Thu, 7 Jun 2007 07:20:28 +0000 (+0000)
Subject: (main): Use `emacs-copyright' in --version output.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18573
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=59be51355485331c04042c6a3f03f92a4635b676;p=emacs.git

(main): Use `emacs-copyright' in --version output.
---

diff --git a/src/emacs.c b/src/emacs.c
index 62b14a55388..e235856847f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -856,17 +856,23 @@ main (argc, argv
          So ignore --version otherwise.  */
       && initialized)
     {
-      Lisp_Object tem;
+      Lisp_Object tem, tem2;
       tem = Fsymbol_value (intern ("emacs-version"));
+      tem2 = Fsymbol_value (intern ("emacs-copyright"));
       if (!STRINGP (tem))
 	{
 	  fprintf (stderr, "Invalid value of `emacs-version'\n");
 	  exit (1);
 	}
+      if (!STRINGP (tem2))
+	{
+	  fprintf (stderr, "Invalid value of `emacs-copyright'\n");
+	  exit (1);
+	}
       else
 	{
 	  printf ("GNU Emacs %s\n", SDATA (tem));
-	  printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n");
+	  printf ("%s\n", SDATA(tem2));
 	  printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
 	  printf ("You may redistribute copies of Emacs\n");
 	  printf ("under the terms of the GNU General Public License.\n");